Added Safety Interfaces