Refactoring main manifest