Improved portability of manifest