Rewrite of the multi-arena support (using less listeners now)