Added support for migration mechanism