Improve metadata retrieval.