Move Manufacturer fetching into Agent