[TASK] refactor round match relationship