moved variable remapping to DataManager