Manifest refactor