Rework of the Invitation Model