Add interchange support for maps