Added a migration and small tweaks to existing structured data migrations