Made cover retrieval more modular