[fix] Refactoring reserved events, like it was before 2.0