Adding Electrical Equipment to the Datagroup Catalog v8i Ss6

I want to add Electrical Equipment to the Datagroup Catalog and would like to know which discipline this should fall under. As we have no requirements for BBES definitions, can I still put Catalog Types under Electrical or should they go under Architectural?

This is what I have done so far

Created a Catalog Type EW Light and added 2 Catalog Items Type 1 and Type 2.

To those 2 Items, I have added the below definitions.