Add support for extended map.