Updated compound data fetch