Added Data mapping