Changes in Customer Mapping methods