Simpler manifest saving, preparation for template refactor