Changed highlight class to be an attribute