Changed zones to templates