Added AnswerInvitationsListener + refactoring