diff --git a/bricksrc/definitions.csv b/bricksrc/definitions.csv
index bef3dba1..aed5982a 100644
--- a/bricksrc/definitions.csv
+++ b/bricksrc/definitions.csv
@@ -295,6 +295,7 @@ https://brickschema.org/schema/Brick#Disable_Hot_Water_System_Outside_Air_Temper
 https://brickschema.org/schema/Brick#Disable_Status,Indicates if functionality has been disabled,
 https://brickschema.org/schema/Brick#Discharge_Air,the air exiting the registers (vents).,
 https://brickschema.org/schema/Brick#Discharge_Chilled_Water,,
+https://brickschema.org/schema/Brick#Disconnect_Switch,A switch that isolates a circuit or equipment by physically breaking the electrical connection.,
 https://brickschema.org/schema/Brick#Displacement_Flow_Air_Diffuser,An air diffuser that is designed for low discharge air speeds to minimize turbulence and induction of room air. This diffuser is used with displacement ventilation systems.,
 https://brickschema.org/schema/Brick#Distribution_Frame,"A class of spaces where the cables carrying signals meet and connect, e.g. a wiring closet or a broadcast downlink room",
 https://brickschema.org/schema/Brick#Domestic_Hot_Water_Circulator_Pump,"Used to move domestic hot water in a closed circuit, ensuring continuous flow.",
@@ -628,7 +629,7 @@ https://brickschema.org/schema/Brick#Interface,A device that provides an occupan
 https://brickschema.org/schema/Brick#Intrusion_Detection_Equipment,,
 https://brickschema.org/schema/Brick#Inverter,A device that changes direct current into alternating current,
 https://brickschema.org/schema/Brick#Isolation_Damper,A damper that isolates a section of ductwork or other air handling system.,
-https://brickschema.org/schema/Brick#Isolation_Switch,See 'Disconnect_Switch',
+https://brickschema.org/schema/Brick#Isolation_Switch,,
 https://brickschema.org/schema/Brick#Isolation_Valve,"A valve that stops the flow of a fluid, usually for maintenance or safety purposes",https://en.wikipedia.org/wiki/Isolation_valve
 https://brickschema.org/schema/Brick#Janitor_Room,A room set aside for the storage of cleaning equipment and supplies,
 https://brickschema.org/schema/Brick#Jet_Nozzle_Air_Diffuser,An air diffuser that is designed to produce high velocity discharge air stream to throw the air over a large distance or target the air stream to a localize area,
@@ -731,7 +732,7 @@ https://brickschema.org/schema/Brick#Luminance_Setpoint,Sets luminance,
 https://brickschema.org/schema/Brick#MDF,"A room for the Main Distribution Frame, the central place of a building where cables carrying signals meet and connect to the outside world",
 https://brickschema.org/schema/Brick#Mail_Room,A room where mail is recieved and sorted for distribution to the rest of the building,
 https://brickschema.org/schema/Brick#Main_Circuit_Breaker,"All breaker panels generally have a main circuit breaker before the bus / MCBs. In some older panels there may be a Main Disconnect Switch instead. It is also possible to have a main disconnect switch, and a main circuit breaker in a panel.",
-https://brickschema.org/schema/Brick#Main_Disconnect_Switch,Building power is most commonly provided by utility company through a master disconnect switch (sometimes called a service disconnect) in the main electrical room of a building. The Utility Company provided master disconnect switch often owns or restricts access to this switch. There can also be other cases where a disconnect is placed into an electrical system to allow service cut-off to a portion of the building.,
+https://brickschema.org/schema/Brick#Main_Disconnect_Switch,Primary service disconnect that isolates an entire building or service entrance from the upstream power source.,
 https://brickschema.org/schema/Brick#Maintenance_Mode_Command,"Controls whether or not a device or controller is operating in ""Maintenance"" mode",
 https://brickschema.org/schema/Brick#Maintenance_Required_Alarm,An alarm that indicates that repair/maintenance is required on an associated device or equipment,
 https://brickschema.org/schema/Brick#Majlis,"In Arab countries, an Majlis is a private lounge where visitors are recieved and entertained",
diff --git a/bricksrc/equipment.py b/bricksrc/equipment.py
index 00fa549c..4a93a110 100644
--- a/bricksrc/equipment.py
+++ b/bricksrc/equipment.py
@@ -182,9 +182,11 @@
                     "Disconnect_Switch": {
                         "tags": [
                             TAG.Disconnect,
+                            TAG.Isolation,
                             TAG.Switch,
                             TAG.Equipment,
                         ],
+                        "aliases": [BRICK.Isolation_Switch],
                         "subclasses": {
                             "Main_Disconnect_Switch": {
                                 "tags": [
@@ -192,22 +194,11 @@
                                     TAG.Disconnect,
                                     TAG.Switch,
                                     TAG.Equipment,
-                                ]
-                            },
-                            "Building_Disconnect_Switch": {
-                                "tags": [
-                                    TAG.Building,
-                                    TAG.Disconnect,
-                                    TAG.Switch,
-                                    TAG.Equipment,
-                                ]
+                                ],
+                                "aliases": [BRICK.Building_Disconnect_Switch],
                             },
                         },
                     },
-                    "Isolation_Switch": {
-                        "tags": [TAG.Isolation, TAG.Switch, TAG.Equipment],
-                        "aliases": [BRICK.Disconnect_Switch],
-                    },
                     "Transfer_Switch": {
                         "tags": [
                             TAG.Transfer,