Added semantic highlighting