Added data event emitter