Added controller Invitation, plus some small changes