That would also solve the migration issues (we can first update expectations, and then implementation)