Add Legacy support