More manifest generation work