Modified migration script and model