Additional changes to migrate manual.