Better manifest generation