Adds support for raw Maps