Refactored manifest, adding document generation