[master] Refactoring - add events