Vendor Mapping fixed