Adding Safety and Evac type enums;