Added client scope to arrivals