Modified User and Match relationship