manifest refactoring