Refactored migrations
Refactored migrations