diff --git a/bricksrc/definitions.csv b/bricksrc/definitions.csv
index 8005df75..7d849cc9 100644
--- a/bricksrc/definitions.csv
+++ b/bricksrc/definitions.csv
@@ -130,16 +130,20 @@ https://brickschema.org/schema/Brick#Chilled_Water_Loop,A collection of equipmen
 https://brickschema.org/schema/Brick#Chilled_Water_Meter,A meter that measures the usage or consumption of chilled water,
 https://brickschema.org/schema/Brick#Chilled_Water_Pump,A pump that performs work on chilled water; typically part of a chilled water system,
 https://brickschema.org/schema/Brick#Chilled_Water_Static_Pressure_Setpoint,Sets static pressure of chilled water,
+https://brickschema.org/schema/Brick#Chilled_Water_Storage_Tank,A tank specifically designed to store chilled water in HVAC systems.,
 https://brickschema.org/schema/Brick#Chilled_Water_System,"The equipment, devices and conduits that handle the production and distribution of chilled water in a building",
 https://brickschema.org/schema/Brick#Chilled_Water_System_Enable_Command,Enables operation of the chilled water system,
 https://brickschema.org/schema/Brick#Chilled_Water_Temperature_Sensor,Measures the temperature of chilled water,
 https://brickschema.org/schema/Brick#Chilled_Water_Temperature_Setpoint,Sets the temperature of chilled water,
+https://brickschema.org/schema/Brick#Chilled_Water_Thermal_Energy_Storage_Tank,"A Thermal Energy Storage (TES) tank is a specialized container for storing thermal energy, enabling more efficient cooling by balancing supply and demand. It helps reduce operational costs and minimizes the need for larger equipment.",
+https://brickschema.org/schema/Brick#Chilled_Water_Thermal_Expansion_Tank,A thermal expansion tank designed specifically for chilled water systems.,
 https://brickschema.org/schema/Brick#Chilled_Water_Valve,A valve that modulates the flow of chilled water,
 https://brickschema.org/schema/Brick#Chiller,Refrigerating machine used to transfer heat between fluids. Chillers are either direct expansion with a compressor or absorption type.,
 https://brickschema.org/schema/Brick#Cloudage,The fraction of the sky obscured by clouds when observed from a particular location,
 https://brickschema.org/schema/Brick#Coil,Cooling or heating element made of pipe or tube that may or may not be finned and formed into helical or serpentine shape (ASHRAE Dictionary),
 https://brickschema.org/schema/Brick#Cold_Box,"in a gas separation unit, the insulated section that contains the low-temperature heat exchangers and distillation columns.",
 https://brickschema.org/schema/Brick#Cold_Deck,Part of a dual duct air handling unit that supplies cooling to a building,
+https://brickschema.org/schema/Brick#Cold_Water_Storage_Tank,"A tank used to store cold water, usually in a building's water supply system.",
 https://brickschema.org/schema/Brick#Coldest_Zone_Air_Temperature_Sensor,The zone temperature that is coldest; drives the supply temperature of hot air. A computed value rather than a physical sensor. Also referred to as a 'Lowest Zone Air Temperature Sensor',
 https://brickschema.org/schema/Brick#Collection_Basin_Water,"Water transiently collected and directed to the sump or pump suction line, typically integral with a cooling tower",https://www.towercomponentsinc.com/cooling-tower-basics-misc-terms-glossary
 https://brickschema.org/schema/Brick#Collection_Basin_Water_Heater,"Basin heaters prevent cold water basin freeze-up, e.g. in cooling towers, closed circuit fluid coolers, or evaporative condensers",https://www.coolingtowerworld.com/c-30-basin-heater.aspx
@@ -430,6 +434,8 @@ https://brickschema.org/schema/Brick#Fire_Alarm_Pull_Station,An active fire prot
 https://brickschema.org/schema/Brick#Fire_Control_Panel,A panel-mounted device that provides status and control of a fire safety system,
 https://brickschema.org/schema/Brick#Fire_Safety_System,"A system containing devices and equipment that monitor, detect and suppress fire hazards",https://assetinsights.net/Glossary/G_Fire_Safety_System.html
 https://brickschema.org/schema/Brick#Fire_Sensor,Measures the presence of fire,
+https://brickschema.org/schema/Brick#Fire_Sprinkler_Thermal_Expansion_Tank,A specialized thermal expansion tank that is part of a building's fire suppression system.,
+https://brickschema.org/schema/Brick#Fire_Sprinkler_Water_Storage_Tank,A specialized tank intended to store water that can be quickly accessed for fire suppression.,
 https://brickschema.org/schema/Brick#Fire_Zone,combustion chamber in a furnace or boiler.,
 https://brickschema.org/schema/Brick#First_Aid_Room,A room for a person with minor injuries can be treated or temporarily treated until transferred to a more advanced medical facility,
 https://brickschema.org/schema/Brick#Floor,"A level, typically representing a horizontal aggregation of spaces that are vertically bound. (referring to IFC)",
@@ -462,6 +468,7 @@ https://brickschema.org/schema/Brick#Gatehouse,The standalone building used to m
 https://brickschema.org/schema/Brick#Generation_Sensor,A sensor measuring how much something has been generated.,
 https://brickschema.org/schema/Brick#Generator_Room,"A room for electrical equipment, specifically electrical generators.",
 https://brickschema.org/schema/Brick#Grains,,
+https://brickschema.org/schema/Brick#Grease_Interceptor,"A larger, more industrial version of a grease trap designed to handle higher volumes of wastewater and more efficiently separate grease and fats.",
 https://brickschema.org/schema/Brick#HVAC_Equipment,See Heating_Ventilation_Air_Conditioning_System,
 https://brickschema.org/schema/Brick#HVAC_System,See Heating_Ventilation_Air_Conditioning_System,
 https://brickschema.org/schema/Brick#HVAC_Zone,"a space or group of spaces, within a building with heating, cooling, and ventilating requirements, that are sufficiently similar so that desired conditions (e.g., temperature) can be maintained throughout using a single sensor (e.g., thermostat or temperature sensor).",
@@ -528,12 +535,15 @@ https://brickschema.org/schema/Brick#Hot_Water_Meter,A meter that measures the u
 https://brickschema.org/schema/Brick#Hot_Water_Pump,A pump that performs work on hot water; typically part of a hot water system,
 https://brickschema.org/schema/Brick#Hot_Water_Radiator,Radiator that uses hot water,
 https://brickschema.org/schema/Brick#Hot_Water_Static_Pressure_Setpoint,Sets static pressure of hot air,
+https://brickschema.org/schema/Brick#Hot_Water_Storage_Tank,A tank designed to store hot water in an HVAC system.,
 https://brickschema.org/schema/Brick#Hot_Water_Supply_Temperature_High_Reset_Setpoint,,
 https://brickschema.org/schema/Brick#Hot_Water_Supply_Temperature_Load_Shed_Status,,
 https://brickschema.org/schema/Brick#Hot_Water_Supply_Temperature_Low_Reset_Setpoint,,
 https://brickschema.org/schema/Brick#Hot_Water_System,"The equipment, devices and conduits that handle the production and distribution of hot water in a building",
 https://brickschema.org/schema/Brick#Hot_Water_System_Enable_Command,Enables operation of the hot water system,
 https://brickschema.org/schema/Brick#Hot_Water_Temperature_Setpoint,Sets the temperature of hot water,
+https://brickschema.org/schema/Brick#Hot_Water_Thermal_Energy_Storage_Tank,"A Thermal Energy Storage (TES) tank is a specialized container for storing thermal energy, enabling more efficient heating by balancing supply and demand. It helps reduce operational costs and minimizes the need for larger equipment.",
+https://brickschema.org/schema/Brick#Hot_Water_Thermal_Expansion_Tank,A thermal expansion tank used in hot water heating systems.,
 https://brickschema.org/schema/Brick#Hot_Water_Usage_Sensor,"Measures the amount of hot water that is consumed, over some period of time",
 https://brickschema.org/schema/Brick#Hot_Water_Valve,A valve regulating the flow of hot water,
 https://brickschema.org/schema/Brick#Humidifier,A device that adds moisture to air or other gases,
@@ -809,6 +819,7 @@ https://brickschema.org/schema/Brick#Peak_Demand_Sensor,The peak power consumed
 https://brickschema.org/schema/Brick#Peak_Power,Tracks the highest (peak) observed power in some interval,
 https://brickschema.org/schema/Brick#Photovoltaic_Array,A collection of photovoltaic panels,
 https://brickschema.org/schema/Brick#Photovoltaic_Current_Output_Sensor,Senses the amperes of electrical current produced as output by a photovoltaic device,
+https://brickschema.org/schema/Brick#Photovoltaic_Inverter, Converts direct current electricity generated by solar panels into alternating current,
 https://brickschema.org/schema/Brick#Piezoelectric_Sensor,"Senses changes pressure, acceleration, temperature, force or strain via the piezoelectric effect",
 https://brickschema.org/schema/Brick#PlugStrip,A device containing a block of electrical sockets allowing multiple electrical devices to be powered from a single electrical socket.,https://en.wikipedia.org/wiki/Power_strip
 https://brickschema.org/schema/Brick#Plumbing_Room,A service room devoted to the operation and routing of water in a building. Usually distinct from the HVAC subsystems.,
@@ -829,7 +840,7 @@ https://brickschema.org/schema/Brick#Pre-Cooling_Air_Unit,"A type of AHU, use to
 https://brickschema.org/schema/Brick#Pre_Filter,A filter installed in front of a more efficient filter to extend the life of the more expensive higher efficiency filter,
 https://brickschema.org/schema/Brick#Pre_Filter_Status,Indicates if a prefilter needs to be replaced,
 https://brickschema.org/schema/Brick#Precipitation,"Amount of atmospheric water vapor fallen including rain, sleet, snow, and hail (https://project-haystack.dev/doc/lib-phScience/precipitation)",
-https://brickschema.org/schema/Brick#Preheat_Command,"A command to activate preheating. Typically used to preheat cool air coming from a mixing box or economizer",
+https://brickschema.org/schema/Brick#Preheat_Command,A command to activate preheating. Typically used to preheat cool air coming from a mixing box or economizer,
 https://brickschema.org/schema/Brick#Preheat_Demand_Setpoint,Sets the rate required for preheat,
 https://brickschema.org/schema/Brick#Preheat_Discharge_Air_Temperature_Sensor,Measures the temperature of discharge air before heating is applied,
 https://brickschema.org/schema/Brick#Preheat_Hot_Water_Valve,,
@@ -863,9 +874,10 @@ https://brickschema.org/schema/Brick#Radioactivity_Concentration_Sensor,Measures
 https://brickschema.org/schema/Brick#Radon_Concentration_Sensor,Measures the concentration of radioactivity due to radon,
 https://brickschema.org/schema/Brick#Rain_Duration_Sensor,Measures the duration of precipitation within some time frame,
 https://brickschema.org/schema/Brick#Rain_Level_Sensor,Measures the amount of precipitation fallen,
+https://brickschema.org/schema/Brick#Rain_Water_Storage_Tank,"A tank engineered to capture and store rainwater, usually for non-potable uses.",
 https://brickschema.org/schema/Brick#Rated_Speed_Setpoint,Sets rated speed,
 https://brickschema.org/schema/Brick#Reactive_Energy_Sensor,Measures the integral of reactive power,
-https://brickschema.org/schema/Brick#Reactive_Power,"Reactive Power}, for a linear two-terminal element or two-terminal circuit, under sinusoidal conditions, is the quantity equal to the product of the apparent power (S) and the sine of the displacement angle (\psi). The absolute value of the reactive power is equal to the non-active power. The ISO (and SI) unit for reactive power is the voltampere. The special name var and symbol \textit{var are given in IEC 60027 1.",
+https://brickschema.org/schema/Brick#Reactive_Power,"Reactive Power, for a linear two-terminal element or two-terminal circuit, under sinusoidal conditions, is the quantity equal to the product of the apparent power (S) and the sine of the displacement angle (\psi). The absolute value of the reactive power is equal to the non-active power. The ISO (and SI) unit for reactive power is the voltampere. The special name var and symbol \textit{var are given in IEC 60027 1.",
 https://brickschema.org/schema/Brick#Reactive_Power_Sensor,"Measures the portion of power that, averaged over a complete cycle of the AC waveform, is due to stored energy which returns to the source in each cycle",
 https://brickschema.org/schema/Brick#Real_Power,"(Active Power) is, under periodic conditions, the mean value, taken over one period (T), of the instantaneous power (p). In complex notation, (P = Re \; S), where (S) is (complex power)"".",
 https://brickschema.org/schema/Brick#Reception,"A space, usually in a lobby, where visitors to a building or space can go to after arriving at a building and inform building staff that they have arrived",
@@ -920,6 +932,7 @@ https://brickschema.org/schema/Brick#Schedule_Temperature_Setpoint,The current s
 https://brickschema.org/schema/Brick#Security_Service_Room,A class of spaces used by the security staff of a facility,
 https://brickschema.org/schema/Brick#Sensor,A Sensor is an input point that represents the value of a device or instrument designed to detect and measure a variable (ASHRAE Dictionary).,
 https://brickschema.org/schema/Brick#Sensor_Equipment,A piece of equipment for sensing some physical properties,
+https://brickschema.org/schema/Brick#Separation_Tank,A tank used in conjunction with a filter to facilitate the separation of filtrate material for disposal.,
 https://brickschema.org/schema/Brick#Server_Room,,
 https://brickschema.org/schema/Brick#Service_Room,"A class of spaces related to the operations of building subsystems, e.g. HVAC, electrical, IT, plumbing, etc",
 https://brickschema.org/schema/Brick#Setpoint,A Setpoint is an input value at which the desired property is set,https://xp20.ashrae.org/terminology/index.php?term=setpoint
@@ -931,7 +944,6 @@ https://brickschema.org/schema/Brick#Site,A geographic region containing 0 or mo
 https://brickschema.org/schema/Brick#Smoke_Alarm,An alarm that indicates the off-normal conditions associated with smoke.,
 https://brickschema.org/schema/Brick#Soil_Temperature_Sensor,Measures the temperature of soil,
 https://brickschema.org/schema/Brick#Solar_Azimuth_Angle_Sensor,Measures the azimuth angle of the sun,
-https://brickschema.org/schema/Brick#Photovoltaic_Inverter," Converts direct current electricity generated by solar panels into alternating current",
 https://brickschema.org/schema/Brick#Solar_Irradiance,The power per unit area of solar electromagnetic radiation incident on a surface,
 https://brickschema.org/schema/Brick#Solar_Irradiance_Sensor,Measures solar irradiance levels for photovoltaic systems,
 https://brickschema.org/schema/Brick#Solar_Radiance,The amount of light that passes through or is emitted from the sun and falls within a given solid angle in a specified direction,
@@ -975,6 +987,7 @@ https://brickschema.org/schema/Brick#Steam_System,"The equipment, devices and co
 https://brickschema.org/schema/Brick#Steam_Usage_Sensor,"Measures the amount of steam that is consumed or used, over some period of time",
 https://brickschema.org/schema/Brick#Step_Parameter,,
 https://brickschema.org/schema/Brick#Storage_Room,A class of spaces used for storage,
+https://brickschema.org/schema/Brick#Storage_Tank,A specialized type of tank intended primarily for the storage of fluids or gases for extended periods.,
 https://brickschema.org/schema/Brick#Studio,"A room used for the production or media, usually with either a specialized set or a specialized sound booth for recording",
 https://brickschema.org/schema/Brick#Substance,,
 https://brickschema.org/schema/Brick#Supply_Air,"(1) air delivered by mechanical or natural ventilation to a space, composed of any combination of outdoor air, recirculated air, or transfer air. (2) air entering a space from an air-conditioning, heating, or ventilating apparatus for the purpose of comfort conditioning. Supply air is generally filtered, fan forced, and either heated, cooled, humidified, or dehumidified as necessary to maintain specified conditions. Only the quantity of outdoor air within the supply airflow may be used as replacement air.",
@@ -1016,6 +1029,7 @@ https://brickschema.org/schema/Brick#System_Status,Indicates properties of the a
 https://brickschema.org/schema/Brick#TABS_Panel,See Thermally_Activated_Building_System_Panel,
 https://brickschema.org/schema/Brick#TETRA_Room,"A room used for local two-way radio networks, e.g. the portable radios carried by facilities staff",
 https://brickschema.org/schema/Brick#TVOC_Level_Sensor,A sensor measuring the level of all VOCs in air,
+https://brickschema.org/schema/Brick#Tank,A container designed to hold or store fluids for various applications within a system.,
 https://brickschema.org/schema/Brick#Team_Room,An office used by multiple team members for specific work tasks. Distinct from Conference Room,
 https://brickschema.org/schema/Brick#Telecom_Room,A class of spaces used to support telecommuncations and IT equipment,
 https://brickschema.org/schema/Brick#Temperature,,
@@ -1034,7 +1048,9 @@ https://brickschema.org/schema/Brick#Temperature_Tolerance_Parameter,A parameter
 https://brickschema.org/schema/Brick#Temporary_Occupancy_Status,"For systems that differentiate between scheduled occupied/unoccupied mode, this indicates if a space is temporarily occupied when it would otherwise be unoccupied",
 https://brickschema.org/schema/Brick#Terminal_Unit,A device that regulates the volumetric flow rate and/or the temperature of the controlled medium.,
 https://brickschema.org/schema/Brick#Thermal_Energy,"Thermal Energy} is the portion of the thermodynamic or internal energy of a system that is responsible for the temperature of the system. From a macroscopic thermodynamic description, the thermal energy of a system is given by its constant volume specific heat capacity C(T), a temperature coefficient also called thermal capacity, at any given absolute temperature (T): (U_{thermal = C(T) \cdot T).",
+https://brickschema.org/schema/Brick#Thermal_Energy_Storage_Tank,"A Thermal Energy Storage (TES) tank is a specialized container for storing thermal energy, enabling more efficient heating and cooling by balancing supply and demand. It helps reduce operational costs and minimizes the need for larger equipment.",
 https://brickschema.org/schema/Brick#Thermal_Energy_Usage_Sensor,A sensor that records the quantity of thermal energy consumed in a given period,
+https://brickschema.org/schema/Brick#Thermal_Expansion_Tank,"A tank designed to accommodate the expansion and contraction of a fluid, typically water, in a closed heating or cooling system.",
 https://brickschema.org/schema/Brick#Thermal_Power,`,
 https://brickschema.org/schema/Brick#Thermal_Power_Meter,A standalone thermal power meter,
 https://brickschema.org/schema/Brick#Thermal_Power_Sensor,,
@@ -1117,8 +1133,9 @@ https://brickschema.org/schema/Brick#Water_Loop,A collection of equipment that t
 https://brickschema.org/schema/Brick#Water_Loss_Alarm,An alarm that indicates a loss of water e.g. during transport,
 https://brickschema.org/schema/Brick#Water_Meter,A meter that measures the usage or consumption of water,
 https://brickschema.org/schema/Brick#Water_Pump,A pump that performs work on water,
+https://brickschema.org/schema/Brick#Water_Storage_Tank,A specialized type of tank intended for the storage of water for extended periods.,
 https://brickschema.org/schema/Brick#Water_System,"The equipment, devices and conduits that handle the production and distribution of water in a building",
-https://brickschema.org/schema/Brick#Water_Tank,A space used to hold water,
+https://brickschema.org/schema/Brick#Water_Tank,A space used to hold water. This will likely be deprecated in future releases of Brick for the sake of clarity w.r.t. equipment classification of tanks,
 https://brickschema.org/schema/Brick#Water_Temperature_Alarm,An alarm that indicates the off-normal conditions associated with temperature of water.,
 https://brickschema.org/schema/Brick#Water_Temperature_Sensor,Measures the temperature of water,
 https://brickschema.org/schema/Brick#Water_Temperature_Setpoint,Sets temperature of water,
diff --git a/bricksrc/equipment.py b/bricksrc/equipment.py
index c491b219..b3546217 100644
--- a/bricksrc/equipment.py
+++ b/bricksrc/equipment.py
@@ -233,6 +233,69 @@
             }
         },
     },
+    "Tank": {
+        "tags": [TAG.Tank, TAG.Equipment],
+        "subclasses": {
+            "Storage_Tank": {
+                "tags": [TAG.Tank, TAG.Equipment, TAG.Storage],
+                "subclasses": {
+                    "Water_Storage_Tank": {
+                        "tags": [TAG.Water, TAG.Storage, TAG.Equipment],
+                        "subclasses": {
+                            "Chilled_Water_Storage_Tank": {
+                                "tags": [TAG.Chilled, TAG.Water, TAG.Storage, TAG.Equipment]
+                            },
+                            "Cold_Water_Storage_Tank": {
+                                "tags": [TAG.Cold, TAG.Water, TAG.Storage, TAG.Equipment]
+                            },
+                            "Hot_Water_Storage_Tank": {
+                                "tags": [TAG.Hot, TAG.Water, TAG.Storage, TAG.Equipment]
+                            },
+                            "Fire_Sprinkler_Water_Storage_Tank": {
+                                "tags": [TAG.Fire, TAG.Water, TAG.Storage, TAG.Equipment]
+                            },
+                            "Rain_Water_Storage_Tank": {
+                                "tags": [TAG.Rain, TAG.Water, TAG.Storage, TAG.Equipment]
+                            },
+                        }
+                    },
+                    "Thermal_Energy_Storage_Tank": {
+                        "tags": [TAG.Thermal, TAG.Energy, TAG.Storage, TAG.Tank, TAG.Equipment],
+                        "subclasses": {
+                            "Chilled_Water_Thermal_Energy_Storage_Tank": {
+                                "tags": [TAG.Chilled, TAG.Water, TAG.Thermal, TAG.Energy, TAG.Storage, TAG.Tank, TAG.Equipment],
+                            },
+                            "Hot_Water_Thermal_Energy_Storage_Tank": {
+                                "tags": [TAG.Hot, TAG.Water, TAG.Thermal, TAG.Energy, TAG.Storage, TAG.Tank, TAG.Equipment],
+                            }
+                        }
+                    }
+                }
+            },
+            "Thermal_Expansion_Tank": {
+                "tags": [TAG.Tank, TAG.Equipment],
+                "subclasses": {
+                    "Chilled_Water_Thermal_Expansion_Tank": {
+                        "tags": [TAG.Chilled, TAG.Thermal, TAG.Expansion, TAG.Tank, TAG.Equipment],
+                    },
+                    "Hot_Water_Thermal_Expansion_Tank": {
+                        "tags": [TAG.Hot, TAG.Thermal, TAG.Expansion, TAG.Tank, TAG.Equipment],
+                    },
+                    "Fire_Sprinkler_Thermal_Expansion_Tank": {
+                        "tags": [TAG.Fire, TAG.Thermal, TAG.Expansion, TAG.Tank, TAG.Equipment],
+                    }
+                }
+            },
+            "Separation_Tank": {
+                "tags": [TAG.Tank, TAG.Equipment],
+                "subclasses": {
+                    "Grease_Interceptor": {
+                        "tags": [TAG.Waste, TAG.Tank, TAG.Equipment],
+                    }
+                }
+            }
+        }
+    }
 }
 
 """