Improve migration interdependencies