Preparing for SwitchClient