Adding data mapping