Added more semantic highlighting