More modifications to the MakeMap function