Updated datamigration