Completed Mapping Module