Refactor manifest