Added in Event Emitter with other small changes