[Cece&Mark] Change models to use goal instead of value proposition