Adding more support for multi-zone addresses