Change: Migrate to the new wrapper