Improved manifest generation support