Added more highlight tags