Updated the MakeMap function to use a data specified syntax