Implemented more robust events [References #21]