Prepare for CDI move