Added additional highlighting
Added additional regex