Add support for Zones

Should we rather remove this argument for now as it has no effect?