Added functionality for zones