Add support for Zones

And I see that it is not used in `core` either...