manifest refactor