Progress on Revamping map functionality