Moved CreateMatch into Match class