Added EventBus and partial implementation of Events