Added more constants to highlight