Added support for Plus Addressing formats