Match internal refactor