MAP added, Dispatcher changed