Refactored migration
fix