Improvements to data store migration