Adapt core changes to API v3