More work on migration scripts