Added Datatype and started replace to gr_mapping