Adding emitter and rooms support