Adding new highlighting and symbol detection with labels