Completed scalar migration