I'll change to using plan object directly.