Use Span instead of Entity