Preparation to SWT migration