Update for upcoming diff fork