Still refactoring migrations