Preparing to change threading model