Revert "Revert "Map Update""

This reverts commit 99d384612be4650c6f43b1013607a60370abea9e.