Added emitter saving and loading