Incorporate latest zone updates and use zone modules