Legacy plan model changes

Let’s continue the conversation over here!