Added zone support