diff --git a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
index b222ecd251..0471c0b863 100644
--- a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
@@ -4375,4 +4375,78 @@ EC2SC:
   - supply_air_temperature_sensor
   - supply_air_temperature_setpoint
   implements:
-  - CONTROL
\ No newline at end of file
+  - CONTROL
+
+CWRISOVM2X:
+  description: "Condensing return water isolation valve control."
+  is_abstract: true
+  implements:
+  - OPERATIONAL
+  opt_uses:
+  - condensing_return_water_isolation_control_status
+  uses:
+  - condensing_return_water_isolation_valve_command_1
+  - condensing_return_water_isolation_valve_command_2
+  - condensing_return_water_isolation_valve_status_1
+  - condensing_return_water_isolation_valve_status_2
+  - condensing_return_water_isolation_valve_mode
+
+
+CWSISOVPM2X:
+  description: "Condensing return water isolation valve control."
+  is_abstract: true
+  implements:
+  - OPERATIONAL
+  opt_uses:
+  - condensing_supply_water_isolation_control_status
+  uses:
+  - condensing_supply_water_isolation_valve_command_1
+  - condensing_supply_water_isolation_valve_command_2
+  - condensing_supply_water_isolation_valve_status_1
+  - condensing_supply_water_isolation_valve_status_2
+  - condensing_supply_water_isolation_valve_mode
+
+
+WLAM:
+  description: "Water level alarm monitoring, generally for a water tank."
+  is_abstract: true
+  uses:
+  - water_high_level_alarm
+  - water_low_level_alarm
+  - water_overflow_level_alarm
+
+WLAM3X:
+  description: "Water level alarm monitoring, generally for a water tank with three independent sets of alarms."
+  is_abstract: true
+  uses:
+  - water_high_level_alarm_1
+  - water_high_level_alarm_2
+  - water_high_level_alarm_3
+  - water_low_level_alarm_1
+  - water_low_level_alarm_2
+  - water_low_level_alarm_3
+  - water_overflow_level_alarm_1
+  - water_overflow_level_alarm_2
+  - water_overflow_level_alarm_3
+
+ECHWTM:
+  description: "Entering chilled water temperature monitoring."
+  is_abstract: true
+  implements:
+  - MONITORING
+  opt_uses:
+  - chilled_water_flowrate_status
+  - leaving_chilled_water_temperature_sensor
+  uses:
+  - entering_chilled_water_temperature_sensor
+
+ECWTM:
+  description: "Entering condensing water temperature monitoring."
+  is_abstract: true
+  implements:
+  - MONITORING
+  opt_uses:
+  - condensing_water_flowrate_status
+  - leaving_condensing_water_temperature_sensor
+  uses:
+  - entering_condensing_water_temperature_sensor
\ No newline at end of file
diff --git a/ontology/yaml/resources/HVAC/entity_types/CDWS.yaml b/ontology/yaml/resources/HVAC/entity_types/CDWS.yaml
index f2d74bda7f..72de210bd9 100644
--- a/ontology/yaml/resources/HVAC/entity_types/CDWS.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/CDWS.yaml
@@ -102,6 +102,18 @@ CDWS_SWTC_WDPM_SWPSS:
   - WDPM
   - SWPSS
 
+CDWS_BYPVPM_WDPM_CWDT:
+  description: "Condensing water header pipe bypass valve, control via differential pressure sensor"
+  is_canonical: true
+  implements:
+  - CDWS
+  - BYPVPM
+  - WDPM
+  - CWDT
+  opt_uses:
+  - bypass_valve_percentage_setpoint
+  - run_mode
+
 ###################################
 ### Existing Non-standard Types ###
 ###################################
@@ -119,4 +131,4 @@ CDWS_US_MTV_2081_1:
   - supply_water_isolation_valve_status_3
   - return_water_isolation_valve_status_3
   - supply_water_isolation_valve_status_4
-  - return_water_isolation_valve_status_4
+  - return_water_isolation_valve_status_4
\ No newline at end of file
diff --git a/ontology/yaml/resources/HVAC/entity_types/CH.yaml b/ontology/yaml/resources/HVAC/entity_types/CH.yaml
index 642635d793..7d4f7bf908 100644
--- a/ontology/yaml/resources/HVAC/entity_types/CH.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/CH.yaml
@@ -499,6 +499,39 @@ CH_SS_SCHWTC_CHDX2SC_REFSM2X_REFPM2X_CWDT:
   - REFPM2X
   - CWDT
 
+CH_SS_CHPM_REFSM_CHDXSC_ECHWTM_ECWTM:
+  description: "water cooled chiller single stage"
+  is_canonical: true
+  implements:
+  - CH
+  - SS
+  - CHPM
+  - REFSM
+  - CHDXSC
+  - ECHWTM
+  - ECWTM
+  opt_uses:
+  - lost_power_alarm
+  - control_mode
+  - reset_command
+  - control_status
+
+CH_SS_CHDX2SC_CWDT:
+  description: "water cooled chiller single stage with compressor & condenser control"
+  is_canonical: true
+  implements:
+  - CH
+  - SS
+  - CHDX2SC
+  - CWDT
+  opt_uses:
+  - lost_power_alarm
+  - control_mode
+  - reset_command
+  - control_status
+  - chilled_water_flowrate_status
+  - condensing_water_flowrate_status
+
 ###################################
 ### Existing Non-standard Types ###
 ###################################
@@ -583,4 +616,28 @@ CH_SS_CHWSWISOVM_CWSISOVM_CWRISOVM_CHWRWISOVM_CHWDT:
   - condensing_supply_water_temperature_sensor
   opt_uses:
   - lost_power_alarm
-  - run_mode
\ No newline at end of file
+  - run_mode
+
+CH_SS_VSFC_CWDT_CWSISOVPM2X_CWRISOVM2X_CHWSWISOVPM_CHWRWISOVPM_REFSM_CHDXSC_CHPM_ECHWTM_ECWTM:
+  description: "Non standard water cooled chiller single stage with chilled/condensing supply/return water isolation valve control. Chilled water flowrate status"
+  implements:
+  - SS
+  - VSFC
+  - CWDT
+  - CWSISOVPM2X
+  - CWRISOVM2X
+  - CHWSWISOVPM
+  - CHWRWISOVPM
+  - REFSM
+  - CHDXSC
+  - CHPM
+  - ECHWTM
+  - ECWTM
+  opt_uses:
+  - lost_power_alarm
+  - control_status
+  - run_mode
+  - reset_command
+  - control_mode
+  - chilled_supply_water_isolation_valve_mode
+  - chilled_return_water_isolation_valve_mode
\ No newline at end of file
diff --git a/ontology/yaml/resources/HVAC/entity_types/CHWS.yaml b/ontology/yaml/resources/HVAC/entity_types/CHWS.yaml
index 369196396d..c3ee5a8361 100644
--- a/ontology/yaml/resources/HVAC/entity_types/CHWS.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/CHWS.yaml
@@ -214,6 +214,17 @@ CHWS_SWTC_WDPC2X_BYPVPM_WFRM_CLPM:
   - WFRM
   - CLPM
 
+CHWS_CHWBYPVPM_CHWDPM:
+  description: "Chilled water header pipe bypass valve, control via differential pressure sensor"
+  is_canonical: true
+  implements:
+  - CHWS
+  - CHWBYPVPM
+  - CHWDPM
+  opt_uses:
+  - run_mode
+  - chilled_water_bypass_valve_percentage_setpoint
+
 ###################################
 ### Existing Non-standard Types ###
 ###################################
@@ -263,3 +274,16 @@ CHWS_US_SVL_TC6_1:
   uses:
   - production_differential_pressure_sensor
   - supply_water_flowrate_sensor # Need to rename to flowrate_sensor
+
+CHWS_CHWDT2X:
+  description: "Chilled water header pipe sensors"
+  implements:
+  - CHWS
+  - CHWDT2X
+  opt_uses:
+  - chilled_supply_water_flowrate_sensor
+  - chilled_supply_water_temperature_sensor_3
+  - chilled_supply_water_temperature_sensor_4
+  - chilled_supply_water_temperature_sensor_5
+  - chilled_return_water_temperature_sensor_3
+  - chilled_return_water_temperature_sensor_4
diff --git a/ontology/yaml/resources/HVAC/entity_types/CT.yaml b/ontology/yaml/resources/HVAC/entity_types/CT.yaml
index 2b6dde1ba1..4101945988 100644
--- a/ontology/yaml/resources/HVAC/entity_types/CT.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/CT.yaml
@@ -131,6 +131,41 @@ CT_SS_VSFC:
   - run_mode
   - lost_power_alarm
 
+CT_SS_VSFC_CDWISOVPM:
+  description: "Cooling tower with condensing water isolation valve control"
+  is_canonical: true
+  implements:
+  - CT
+  - SS
+  - VSFC
+  - CDWISOVPM
+  opt_uses:
+  - lost_power_alarm
+  - control_status
+  - run_mode
+  - schedule_run_command
+  - reset_command
+  - condensing_water_isolation_valve_mode
+  - condensing_water_flowrate_status
+  - control_mode
+
+CT_SS_VSFC_CWSISOVPM2X_CWRISOVM2X:
+  description: "Non standard cooling tower with condensing return/supply isolation valve control"
+  is_canonical: true
+  implements:
+  - CT
+  - SS
+  - VSFC
+  - CWSISOVPM2X
+  - CWRISOVM2X
+  opt_uses:
+  - lost_power_alarm
+  - control_status
+  - run_mode
+  - reset_command
+  - heat_percentage_sensor
+  - control_mode
+
 ###################################
 ### Existing Non-standard Types ###
 ###################################
diff --git a/ontology/yaml/resources/HVAC/entity_types/GENERALTYPES.yaml b/ontology/yaml/resources/HVAC/entity_types/GENERALTYPES.yaml
index 30ef80dfe5..1b648f041b 100644
--- a/ontology/yaml/resources/HVAC/entity_types/GENERALTYPES.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/GENERALTYPES.yaml
@@ -348,3 +348,10 @@ DOAS:
   is_abstract: true
   implements:
   - EQUIPMENT
+
+TK:
+  description: "Water tank."
+  is_abstract: true
+  implements:
+    - EQUIPMENT
+
diff --git a/ontology/yaml/resources/HVAC/entity_types/PMP.yaml b/ontology/yaml/resources/HVAC/entity_types/PMP.yaml
index e2175e27d1..0bad1d6401 100644
--- a/ontology/yaml/resources/HVAC/entity_types/PMP.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/PMP.yaml
@@ -119,6 +119,24 @@ PMP_SS_CWCS_VSFC:
   - run_mode
   - lost_power_alarm
 
+PMP_SS_CDWISOVPM_VSFC:
+  description: "Primary condenser water pump with condensing water isolation valve control"
+  is_canonical: true
+  implements:
+  - PMP
+  - SS
+  - CDWISOVPM
+  - VSFC
+  opt_uses:
+  - lost_power_alarm
+  - control_status
+  - low_differential_pressure_alarm
+  - run_mode
+  - reset_command
+  - condensing_water_isolation_valve_mode
+  - condensing_water_flowrate_status
+  - control_mode
+
 ###################################
 ### Existing Non-standard Types ###
 ###################################
@@ -140,4 +158,49 @@ PMP_S_VSCF_ISV:
   uses:
   - mixing_valve_percentage_command
   - chilled_supply_water_temperature_setpoint
-  - chilled_supply_water_temperature_sensor
\ No newline at end of file
+  - chilled_supply_water_temperature_sensor
+
+PMP_SS_CHWP_PCWP:
+  description: "Non standard chilled & Primary water pump"
+  implements:
+  - PMP
+  - SS
+  opt_uses:
+  - control_status
+  - run_mode
+  - lost_power_alarm
+  - low_differential_pressure_alarm
+  - reset_command
+
+PMP_SS_VSFC_SHWP:
+  description: "Non standard secondary chilled water pump"
+  implements:
+  - PMP
+  - SS
+  - VSFC
+  opt_uses:
+  - lost_power_alarm
+  - control_status
+  - chilled_water_flowrate_status
+  - run_mode
+  - reset_command
+  - heat_percentage_sensor
+  - control_mode
+
+
+PMP_SS_CHWISOVPM_VSFC_CHWP_PCWP:
+  description: "Non standard chilled & secondary chilled water pump with chilled water isolation valve control"
+  implements:
+  - PMP
+  - SS
+  - CHWISOVPM
+  - VSFC
+  opt_uses:
+  - lost_power_alarm
+  - control_status
+  - low_differential_pressure_alarm
+  - run_mode
+  - reset_command
+  - chilled_water_flowrate_status
+  - chilled_water_isolation_valve_mode
+  - control_mode
\ No newline at end of file
diff --git a/ontology/yaml/resources/HVAC/entity_types/TK.yaml b/ontology/yaml/resources/HVAC/entity_types/TK.yaml
new file mode 100644
index 0000000000..951b3a0c2f
--- /dev/null
+++ b/ontology/yaml/resources/HVAC/entity_types/TK.yaml
@@ -0,0 +1,23 @@
+# Copyright 2020 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the License);
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an AS IS BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+########################
+### Canonical Types  ###
+########################
+
+TK_WLAM3X:
+  description: "A water tank with three sets of alarms for high, low, and overflow alerting."
+  implements:
+  - TK
+  - WLAM3X
\ No newline at end of file
diff --git a/ontology/yaml/resources/METERS/entity_types/HM.yaml b/ontology/yaml/resources/METERS/entity_types/HM.yaml
index 15ef5214a6..1da1de154c 100644
--- a/ontology/yaml/resources/METERS/entity_types/HM.yaml
+++ b/ontology/yaml/resources/METERS/entity_types/HM.yaml
@@ -48,3 +48,16 @@ HM_HW:
   - heating_return_water_temperature_sensor
   - heating_thermal_power_sensor
   - heating_thermal_energy_accumulator
+
+
+HM_CW:
+  description: "Cooling load heat meter for condensing water header pipe."
+  implements:
+  - HM
+  is_canonical: true
+  uses:
+  - condensing_water_flowrate_sensor
+  - condensing_supply_water_temperature_sensor
+  - condensing_return_water_temperature_sensor
+  - cooling_thermal_power_sensor
+  - cooling_thermal_energy_accumulator
\ No newline at end of file
diff --git a/ontology/yaml/resources/fields/telemetry_fields.yaml b/ontology/yaml/resources/fields/telemetry_fields.yaml
index 0d3432bfe8..d82d861c35 100644
--- a/ontology/yaml/resources/fields/telemetry_fields.yaml
+++ b/ontology/yaml/resources/fields/telemetry_fields.yaml
@@ -601,7 +601,9 @@ literals:
 - heat_exchange_supply_water_isolation_valve_percentage_sensor
 - heat_exchange_return_water_isolation_valve_percentage_sensor
 
-- condensing_return_water_isolation_valve_command
+- condensing_return_water_isolation_valve_command:
+  - OPEN
+  - CLOSED
 - chilled_return_water_isolation_valve_percentage_sensor
 - chilled_return_water_isolation_valve_percentage_command
 
@@ -619,8 +621,9 @@ literals:
 - condensing_supply_water_isolation_valve_status:
   - OPEN
   - CLOSED
-- condensing_supply_water_isolation_valve_command
-
+- condensing_supply_water_isolation_valve_command:
+  - OPEN
+  - CLOSED
 
 # Added 4/12/20
 - supply_air_damper_percentage_sensor
@@ -652,6 +655,8 @@ literals:
 - control_mode:
   - AUTO
   - MANUAL
+  - LOCAL
+  - REMOTE
   - OFF
 - cooling_thermal_energy_accumulator
 - particle_concentration_sensor
@@ -695,6 +700,49 @@ literals:
   - PRESENT
   - ABSENT
 
+# Added for TPKD day2
+- condensing_supply_water_isolation_valve_mode:
+  - MANUAL
+  - AUTO
+- condensing_return_water_isolation_valve_mode:
+  - MANUAL
+  - AUTO
+- chilled_supply_water_isolation_valve_mode:
+  - MANUAL
+  - AUTO
+- chilled_return_water_isolation_valve_mode:
+  - MANUAL
+  - AUTO
+- water_high_level_alarm:
+  - ACTIVE
+  - INACTIVE
+- water_overflow_level_alarm:
+  - ACTIVE
+  - INACTIVE
+- water_low_level_alarm:
+  - ACTIVE
+  - INACTIVE
+- reset_command:
+  - ON
+  - OFF
+- chilled_water_isolation_valve_mode:
+  - AUTO
+  - MANUAL
+- heat_percentage_sensor
+- condensing_return_water_isolation_control_status:
+  - LOCAL
+  - REMOTE
+- condensing_supply_water_isolation_control_status:
+  - LOCAL
+  - REMOTE
+
+# These points only true or false
+- chilled_water_bypass_valve_percentage_setpoint
+- bypass_valve_percentage_setpoint
+- condensing_water_isolation_valve_mode:
+  - AUTO
+  - MANUAL
+
 # New alarms using alarm as a point type, and existing alarms moved here
 # TODO (tsodorff): change these to ALARM/NORMAL after determining how this can be done safely to existing translations. 
 - fabric_protection_alarm:
@@ -735,6 +783,9 @@ literals:
   - STANDBY
 - battery_charge_percentage_sensor
 - brightness_percentage_command
+- speed_mode:
+  - MANUAL
+  - AUTO
 
 # New fields for emergency systems
 - broken_cable_alarm:
@@ -756,6 +807,15 @@ literals:
 - position_status
 - condensing_water_valve_percentage_sensor
 - entering_cooling_coil_temperature_sensor
+- condensing_supply_water_isolation_valve_open_status
+- condensing_supply_water_isolation_valve_closed_status
+- condensing_supply_water_isolation_valve_open_command
+- condensing_supply_water_isolation_valve_closed_command
+- entering_chilled_water_temperature_sensor
+- leaving_chilled_water_temperature_sensor
+- compressor_percentage_sensor
+- entering_condensing_water_temperature_sensor
+- leaving_condensing_water_temperature_sensor
 
  # We should not use this... represents scavenged outside air from near some heat pumps...
 - mixed_outside_air_temperature_sensor
diff --git a/ontology/yaml/resources/subfields/subfields.yaml b/ontology/yaml/resources/subfields/subfields.yaml
index c4f05cd1c1..661b480770 100644
--- a/ontology/yaml/resources/subfields/subfields.yaml
+++ b/ontology/yaml/resources/subfields/subfields.yaml
@@ -24,6 +24,7 @@ aggregation_descriptor:
 component:
   battery: "A device used to store power for use at a later time (e.g. in an emergency where grid power is unavailable)."
   bearing: "Machine element that constrains relative motion to only the desired motion, and reduces friction between moving parts."
+  break: "A device for slowing or stopping a moving vehicle, typically by applying pressure to the wheels"
   cable: "A length of wire, sometimes shielded externally, used for some purpose (e.g. steel braided wire for tensile support, CAT5 cable for communications, etc.)."
   coil: "Component that exchanges heat between two media streams."
   compressor: "Component which drives refrigerant compression (and thus cooling processes) within a device or system."
@@ -40,9 +41,11 @@ component:
   evaporator: "The component of a refrigeration system that evaporates refrigerant."
   fan: "Component used for the distribution of air."
   filter: "Component used for removing dust and other particulate matter from the air."
+  fin: "A component attached to the shaft help in heat transfer from the inside of the motor housing to the outer environment"
   guidevane: "Control vanes that meter refrigerant (on a centrifugal chiller) or air (on an AHU)."
   heater: "Component which provides heat to media."
   humidifier: "Component which humidifies."
+  inverter: "An apparatus which converts direct current into alternating current."
   lamp: "The component of a lighting device that emits the light."
   motor: "A machine, especially one powered by electricity or internal combustion, that supplies motive power for a vehicle or for some other device with moving parts."
   pump: "Component used for the distribution of liquid media."
@@ -100,6 +103,7 @@ descriptor:
   flue: "Chimney for conveying exhaust gas."
   formaldehyde: "A simple, pungent organic compound (gas under standard conditions), simplest of the aldehydes."
   frost: "Freezing water on a surface."
+  overflow: "flow over the brim of a receptacle."
   ## TODO: make it so gas only has one meaning
   gas: "Process or component driven by natural gas (as to distinguish from electric)."
   glycol: "Liquid mixture consisting of glycol and water "
@@ -123,6 +127,7 @@ descriptor:
   lighting: "Illumination of a room"
   limit: "A boundary condition for a control (e.g. low limit)."
   line: "Refers to the incoming electrical feed (e.g. line current)."
+  load: "The quantity or amount of work that can be carried or operated at one time by a specified means."
   local: "A definite spatial location involving only a subset of the larger surrounding area."
   loop: "Recirculating loop."
   low: "Level of control or measurement; below medium and high; opposite of high."
@@ -172,6 +177,7 @@ descriptor:
   release: "To free from constraints (e.g. to release the door from its magnetic lock)."
   refrigerant: "Substance used in the mechanical refrigeration process (e.g. R-134a)"
   request: "A signal from a system device that calls for more of a particular conditioning process (e.g. pressure requests from terminal units)."
+  reset: "Return the value of a device to an initial state."
   return: "Measurement or process of media as it is returned from the end-use equipment within the system."
   reversing: "Reverses direction of flow (e.g. reversing valve on heat pump)."
   room: "A space that can be occupied, or a part or division of a building or floor enclosed by walls."
@@ -182,7 +188,8 @@ descriptor:
   secondary: "Associated with the secondary (distribution) loop of a produciton process."
   seismic: "Related to seismic activity (such as seismic gas shutoff valves)."
   side: "Position relative to an an object."
-  signal: "An electric current or electromagnetic field used to convey data from one device to another."  
+  signal: "An electric current or electromagnetic field used to convey data from one device to another."
+  simulation: "The production of a computer model of something, especially for the purpose of study."
   smoke: "Visible, suspended particles created during a fire."
   source: "The upstream source of conditioning (used specifically for heat exchangers)."
   south: "Cardinal direction; opposite of north"
@@ -240,7 +247,7 @@ measurement:
   resistance: "Electrical resistance."
   specificenthalpy: "Measure of energy of air per unit mass."
   temperature: "Measures the temperature of media within a process or system."
-  time: "defined duration of something."
+  time: "Defined duration of something."
   voltage: "Electrical potential difference between two reference points."
   voltageratio: "The ratio of the Primary voltage of the transformer to the secondary voltage."
   volume: "The quantity of three-dimensional space contained by a closed surface."
@@ -273,6 +280,7 @@ measurement_descriptor:
   speed: "Numeric setting of how fast to run a device, in the specified untis. Typically used to describe revolutions of a motor as a fraction of nominal or maximum."
   start: "Indicates a point in time or space at which something has its origin or beginning."
   static: "Resting or stagnant value (e.g. static_pressure_sensor)."
+  stop: "cause (an action, process, or event) to come to an end"
   thermal: "Relating to the transfer of heat."
   tilt: "Degree of radial rotation."
   wetbulb: "Describes air temperature measured at 100% relative humidity (saturation)."
diff --git a/ontology/yaml/resources/units/units.yaml b/ontology/yaml/resources/units/units.yaml
index 18e777a9b9..994f35e9a3 100644
--- a/ontology/yaml/resources/units/units.yaml
+++ b/ontology/yaml/resources/units/units.yaml
@@ -37,6 +37,7 @@ energy:
 - kilowatt_hours
 - megawatt_hours
 - therms
+- newton_meters
 flowrate:
 - cubic_meters_per_second: STANDARD
 - cubic_feet_per_minute
@@ -47,6 +48,7 @@ flowrate:
 - kilograms_per_hour
 frequency:
 - hertz: STANDARD
+- revolutions_per_minute
 humidity:
 - percent_relative_humidity: STANDARD
 illuminance:
@@ -104,5 +106,7 @@ volume:
 - liters
 time:
 - seconds: STANDARD
+- minutes
+- hours
 rate:
 - inv_second: STANDARD
diff --git a/python.exe b/python.exe
new file mode 100644
index 0000000000..15eba5c1f5
Binary files /dev/null and b/python.exe differ