[Build] Improved generated manifest files