Added more persistence and Match class