The listeners should be factories. This way they do not need the serviceManager dependency.
Fix merge issues