Update guest model to be a tad more flexible.