Updated SWT support