Remove broadcast method
Add samples for new event framework