RSVP: FE changes to support rsvp flow