Added improvements for zone specific scripts.