Enhance User migration