Legacy adapter improved