Modified migration scripts
Simplified utils