Added AnserInvitation Class + refactoring