Upgraded deferred-emitter, emitter and fixed bug on DOM storage