Added function and class highlighting