few improvements to AddGuideModel