Adding user and usermatch classes