Migrate to new API.