Modifications to implement migrate feature