Add guideline and improve descriptions