Added more Map support.