Moved key info fetching into its own module