Added support for migration