Add origin matching