Add location objects, use pattern matching