Moving all make_manifest behavior into make_manifest