Update for legacy branch