Allow more flexible matching and remove default ordering