add zone support