Improve plan model