Refactor manifest maker to component