Added support for emitter layers