Change ManifestReader to be more modular