Rename Core->Dispatcher, add RawData