Updated extraction of legacy data