Added multi-zone possibility.