Turn EventDispatcher into generic solution handling plugins as well