Added Span and Highlight Support