Add more highlighting