Add support for Zones

Shouldn't this run inside of the zone?