adding datazone handling