Update for Legacy support