Events refactoring - now events contain component reference