Added support for Mapping Protocol.