Added metadata fetching