Add map support.