Restructure the data mapping process