fixup! Migration refactoring