Improve metadata extraction.