完善 Mapping