Discovery info can just be fetched when needed!  No need to pass it around