Commit 12: removed die function in util and added event dicts