Add support for Zones