Refactored manifest