Refactoring for updated manifest files.