Feature/event rework