including cluster and zone in locations