some better handling of migration and fix primary dataet for user MC