Refactored dispute matches