added event bus and eventhandler features