[PATCH 2/3] MessageDispatcher: use connection_mapping