Suggestion by GloryFish: change manifest to config throughout