Rework match initialization