Removed dependency on StructuredSourceViewer