Enhance utilities for Map
Merge remote-tracking branch 'RaymondChao/enhance-maps'