Improved index migration