Fixed bufferDataEmitter
Added helper methods and moved bufferDataEmitter