Updates to Socket Emitter