Prepare to move to new data system