Bug #2330: Add changes to migrator