The Standard for Electrical Safety in the Workplace, NFPA 70E, and relevant OSHA electrical safety standards evolved in the US, over the past 40 years, to address the hazards of 60-Hz power that are faced primarily by electricians, linemen, and others performing facility and utility work. This leaves a substantial gap in the management of other types of electrical hazards including battery banks, DC power systems, capacitor banks, and solar power systems. Although many of these systems are fed by 50/60-Hz alternating current (ac) energy, we find substantial use of direct current (dc) electrical energy, and the use of capacitors, inductors, batteries, solar, and radiofrequency (RF) power. The electrical hazards of these forms of electricity and their systems are different than for 50/60 Hz ac power.At this workshop in 2009 we presented a comprehensive approach to classifying the electrical shock hazards of all types of electricity, including various waveforms and various types of sources of electrical energy. That paper introduced a new comprehensive electrical shock hazard classification system that used a combination of voltage, shock current available, fault current available, power, energy, and waveform to classify all forms of electrical hazards with a focus on the shock hazard.