branches/fault: added support for events