Added Event Queue and Event Dispatcher