Add keywords, and symbols support