Enhance utilities for Map