Attempt to migrate to 2.0 schema