* Also include internal events in the FMEA
* Add more helper functions