Legacy support improvements