Added docblock properties
Added EventEmitter